bitkeeper revision 1.1203 (421096dcaYyLUeJDWzUpv9mpMfjHfQ)

Merge cleanups.

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index ab0ef0960f9636b8744b93eaa0b654b59e6497ee..da2ed5cd50e36ac76eefb84226d449c2645f58db 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -286,7 +286,7 @@ asmlinkage int do_page_fault(struct xen_regs *regs)
              ((regs->error_code & 3) == 3) && /* write-protection fault */
              ptwr_do_page_fault(addr) )
         {
-            if ( unlikely(shadow_mode(d)) )
+            if ( unlikely(shadow_mode_enabled(d)) )
                 (void)shadow_fault(addr, regs->error_code);
             UNLOCK_BIGLOCK(d);
             return EXCRET_fault_fixed;
@@ -294,7 +294,7 @@ asmlinkage int do_page_fault(struct xen_regs *regs)
         UNLOCK_BIGLOCK(d);
     }
 
-    if ( unlikely(shadow_mode(d)) && 
+    if ( unlikely(shadow_mode_enabled(d)) && 
          (addr < PAGE_OFFSET) && shadow_fault(addr, regs->error_code) )
         return EXCRET_fault_fixed;
 
@@ -330,7 +330,7 @@ asmlinkage int do_page_fault(struct xen_regs *regs)
     if ( likely((fixup = search_exception_table(regs->eip)) != 0) )
     {
         perfc_incrc(copy_user_faults);
-        if ( !shadow_mode(d) )
+        if ( !shadow_mode_enabled(d) )
             DPRINTK("Page fault: %p -> %p\n", regs->eip, fixup);
         regs->eip = fixup;
         return 0;